Revert problematic fixes.

diff --git a/ChangeLog b/ChangeLog
index 9dad7f746da13105a556cb2813eae5a44742a768..52645aed060a773dd1226b2808f6f973dc4d4f13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+       Revert the fix for #169870, adjust the documentation instead. 
+
+       * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): 
+       Revert the fix for #170727.     
+
 2005-04-11  Ivan, Wong Yat Cheung  <email@ivanwong.info>
 
        Fix #300218:
@@ -71,6 +79,7 @@
        Enter the "user-resized" state of the column only if a drag
        actually changes the column width, not on any click.
 
+>>>>>>> 1.6531
 2005-04-07  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_paint): Allow setting background

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9dad7f746da13105a556cb2813eae5a44742a768..52645aed060a773dd1226b2808f6f973dc4d4f13 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2005-04-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+       Revert the fix for #169870, adjust the documentation instead. 
+
+       * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): 
+       Revert the fix for #170727.     
+
 2005-04-11  Ivan, Wong Yat Cheung  <email@ivanwong.info>
 
        Fix #300218:
@@ -71,6 +79,7 @@
        Enter the "user-resized" state of the column only if a drag
        actually changes the column width, not on any click.
 
+>>>>>>> 1.6531
 2005-04-07  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_paint): Allow setting background

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9dad7f746da13105a556cb2813eae5a44742a768..52645aed060a773dd1226b2808f6f973dc4d4f13 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2005-04-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+       Revert the fix for #169870, adjust the documentation instead. 
+
+       * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): 
+       Revert the fix for #170727.     
+
 2005-04-11  Ivan, Wong Yat Cheung  <email@ivanwong.info>
 
        Fix #300218:
@@ -71,6 +79,7 @@
        Enter the "user-resized" state of the column only if a drag
        actually changes the column width, not on any click.
 
+>>>>>>> 1.6531
 2005-04-07  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_paint): Allow setting background